From 700e54fce03734329441d08bc2d4076334ff4cff Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 21 Feb 2016 02:20:43 +0100
Subject: [PATCH] Revert "always support packagekit if dbus is enabled"

This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.

Gbp-Pq: Name no-packagekit-per-default.diff
---
 Repository.mk                               |   2 +-
 RepositoryExternal.mk                       |   6 ++++++
 config_host.mk.in                           |   1 +
 configure.ac                                | Bin 455687 -> 456233 bytes
 postprocess/Rdb_services.mk                 |   4 +++-
 sfx2/source/appl/appserv.cxx                |   9 +++++++++
 shell/Module_shell.mk                       |   2 ++
 sw/source/uibase/app/apphdl.cxx             |   8 ++++++++
 vcl/inc/unx/fontmanager.hxx                 |   4 ++--
 vcl/unx/generic/fontmanager/fontconfig.cxx  |   8 ++++----
 vcl/unx/generic/fontmanager/fontmanager.cxx |   2 +-
 11 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 0ab7edca475..f7591ab4029 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -308,7 +308,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 	$(if $(ENABLE_GTK),vclplug_gtk) \
 	$(if $(ENABLE_GTK3),vclplug_gtk3) \
 	$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
-	$(if $(ENABLE_GIO),losessioninstall) \
+	$(if $(ENABLE_PACKAGEKIT),losessioninstall) \
 	$(if $(ENABLE_GIO),ucpgio1) \
 ))
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f3edf136455..3bbcace7f5c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2564,6 +2564,12 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$(DBUS_CFLAGS) \
 )
 
+ifeq ($(ENABLE_PACKAGEKIT),TRUE)
+$(call gb_LinkTarget_add_defs,$(1),\
+    -DENABLE_PACKAGEKIT \
+)
+endif # ENABLE_PACKAGEKIT
+
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(DBUS_LIBS) \
 )
diff --git a/config_host.mk.in b/config_host.mk.in
index dc93811bff8..a5b76255adf 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -156,6 +156,7 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
+export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_PDFIUM=@ENABLE_PDFIUM@
diff --git a/configure.ac b/configure.ac
index 2c879879693eadd4aa0eb143dc5081448edf95d3..7f68c80b13aa9df4169301ec13fe6c323dc07a10 100644
GIT binary patch
delta 355
zcmZpFA-(dA^oE1$CQsNZGWqQ~waIB4`8W#_ld}`kQ?oNC8$OntJYfwx7hI%dvf)al
z$)4*3>`IF>^U@U%5_((;Fc6fPo>8KZmtU?>l95=VkXfvdSXz>=kd~hZ<m45XB<AEy
zp14D{Sz~>>#(G8|W&&d7?HcP@BoE3Vt5PV-OhmFGR+DSGNinO|^tTO69Mg65n0S;B
z_A4pqCMqbYq~;|i<)p?V#HR~#ut-dQ(8t8V>FDh3=<e$688SVvnMrnf!*)il=@W#Q
zc&FdzVPfYFfJ@s>S8QXHnw}uV#5LX5f{k;!K?n=~bb*`9EPN?RrNs&<nZ+PWQuL-b
fsxygkAv8`GY+{n1zTg)Nd%I%+>vqQiwqwlz4pe%7

delta 89
zcmZ4aM!Nll^oE1$#B~%BOH1-|6H79a71HwaN)$5lic1o6CLdU5J^92cvB_&Uuul#;
tB{6+IBO~YJ`y1Gsf39!;xt<Y-nShvi`_J_(FAuaQ7qM<nE@C^@3;;gGDvJOB

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index ce8649ed7f7..cf94960358f 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -196,9 +196,11 @@ $(eval $(call gb_Rdb_add_components,services,\
         canvas/source/opengl/oglcanvas \
 	) \
 	$(if $(ENABLE_GIO), \
-		shell/source/sessioninstall/losessioninstall \
 		ucb/source/ucp/gio/ucpgio \
 	) \
+	$(if $(ENABLE_PACKAGEKIT), \
+		shell/source/sessioninstall/losessioninstall \
+	) \
 	$(if $(ENABLE_GSTREAMER_1_0), \
 		avmedia/source/gstreamer/avmediagstreamer \
 	) \
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d6424c2d06e..17f1296bffa 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -198,6 +198,7 @@ namespace
         // make sure we actually can instanciate services from base first
         if(!lcl_isBaseAvailable())
         {
+#if defined (ENABLE_PACKAGEKIT)
             try
             {
                 using namespace org::freedesktop::PackageKit;
@@ -215,8 +216,16 @@ namespace
                 SAL_INFO(
                     "sfx.appl",
                     "trying to install LibreOffice Base, caught " << e.Message);
+#else
+                SAL_INFO(
+                    "sfx.appl",
+                    "missing LibreOffice Base");
+
+#endif
+#if defined (ENABLE_PACKAGEKIT)
             }
             return;
+#endif
         }
 
         try // fdo#48775
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index cfe7aa061ce..0371f399db3 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -16,11 +16,13 @@ $(eval $(call gb_Module_add_targets,shell,\
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 ifeq ($(ENABLE_GIO),TRUE)
+ifeq ($(ENABLE_PACKAGEKIT),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
 	Library_losessioninstall \
 ))
 endif
 endif
+endif
 
 ifeq ($(OS),SOLARIS)
 ifeq ($(ENABLE_GIO),TRUE)
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 23b9b5bdec2..a2305095b7b 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -414,6 +414,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -430,8 +431,15 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
             SAL_INFO(
                 "sw.core",
                 "trying to install LibreOffice Base, caught " << e.Message);
+#else
+            SAL_INFO(
+                "sw.core",
+                "missing LibreOffice Base");
+#endif
+#if defined (ENABLE_PACKAGEKIT)
         }
         return;
+#endif
     }
     if ( m_pView )
     {
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 2e89c5f655b..3e37f6bede3 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -211,12 +211,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     static void addFontconfigDir(const OString& rDirectory);
 
     std::set<OString> m_aPreviousLangSupportRequests;
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
     std::vector<OString> m_aCurrentRequests;
 #endif
     Timer m_aFontInstallerTimer;
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
     DECL_LINK( autoInstallFontLangSupport, Timer*, void );
 #endif
     PrintFontManager();
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index d451f482b90..99094728c91 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -39,7 +39,7 @@ using namespace psp;
 #include <ft2build.h>
 #include <fontconfig/fcfreetype.h>
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
 #include <dbus/dbus-glib.h>
 #endif
 
@@ -863,7 +863,7 @@ namespace
         return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
     }
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
     guint get_xid_for_dbus()
     {
         const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow();
@@ -873,7 +873,7 @@ namespace
 #endif
 }
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
 IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
 {
     if (!officecfg::Office::Common::PackageKit::EnableFontInstallation::get())
@@ -1092,7 +1092,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
                     }
                 }
                 OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
                 if (get_xid_for_dbus())
                 {
                     if (sStillMissing == rMissingCodes) //replaced nothing
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 2b961e58fa0..1bc7ade2f2b 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -134,7 +134,7 @@ PrintFontManager::PrintFontManager()
     : m_nNextFontID( 1 )
     , m_nNextDirAtom( 1 )
 {
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
     m_aFontInstallerTimer.SetInvokeHandler(LINK(this, PrintFontManager, autoInstallFontLangSupport));
     m_aFontInstallerTimer.SetTimeout(5000);
 #endif
-- 
2.30.2